Fix an issue with the previous merge, my bad!