Fixed an issue from messing up the previous merge.