Skip validation from being performed twice (#90)