Work around labelling issue in updates