Attempt to fix CURRIKI-5979