Fixed introduced validation errors