Fixed failing unit test after latest changed in 1.10.x branch