closes #761