MYHOARD-742 fixed