better handling of label changes