close #16, even if more checks should be cool