nurant_ISSUE22_7