Fix after merge with 1.8.x