HR-299 fix