HR-333 fix