ISPN-3318 Temporary fix...