ISPN-2974 fix