--HR-194 modification to remove loop