closes #937