should close #634