Fixed a bug that resulted from the new labeling