Fixed validation state check bug