HOSTDEV-969 fixed