Fixed that weird bug that cropped up after the merge