Better validation, will break the tests