Bug fix for warehouse