closes #940