nurant_ISSUE22_2