[2.6] p1 fix