MYHOARD-546 Fixed bugs