Fixed the weird things that just happened with that merge