Fix for the previous merge