Fix validation. Fixes #69