Fixed critical error that cropped up when merging.