Validation error bug fix