MYHOARD-789 fixed