closes #925