closes #887