ISPN-3819 Fix intermittent failures