fixing validation errors 40