closes #837