fixed validation errors