closes #757