closes #909

closes #909