MYHOARD-846 fixed