Fix for a my previous merge