MYHOARD-734 fixed