fix failing unit test
Merge branch 'issue813' into 1.7.x