Store after validation

It might solve #42 issue.