closes #935