fixed validation termination