closes #962