nurant_ISSUE22_3