MYHOARD-733 fixed