Fixed logic to validate entire row