fix 2.6 layout