HR-332 fix