closes #945