closes #741