Quickfix for queue/liberation issue