Fixes the previous merge