closes #950