patch from Hal to fix changing_labels