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