HR-233 fix