Quickfix for queue ordering