Add workaround for ISPN-4969