Custom validation was overriding a little too much of normal validation. Fixes #372