closes #960