closes #885