Fixed validation errors #4