Fix queue some more..