Sorted out glitches