SVY-6243 put back fix from andrei