Forgot to change valide call order for #71
Resolves #72