closes #995