2nd Fix for uninitialized queue during load