Fixed a bug that cropped up in merging a couple commits.