Simplify code to fix COV 1250448