fix validation errors. close #3