Fixing a stupid bug that appeared when trying to merge