closes #823