MYHOARD-459 bug fix