Fix labelling order