closes #844