HR-273 fix