Fix for new labelling system