1.9.x like fix