Warehouse fix