nurant_ISSUE22_6