MYHOARD-840 fixed