fixing validation errors 36