fix for validation delay issue