HR-314 fix and HR-293 improvement