closes #832