MYHOARD-788 fixed