nurant_ISSUE22_8