For 1.7.x