Fixed: validations
Fixed: bug