Resolves #88
Should not go in the validator