#310
fix for branch 2.10.x