Fixed "accordion" glitches