HR-340 partial fix