MYHOARD-792 - Fixed