Fixing a bad merge from my previous commit