probably fix for EDY-672

#EDY-672 fixed