Fixing my previous merge