MYHOARD-791 fixed