Fixed validation errors #5