Fixing previous merge