Fixed one more bug for validation