Ah, seems Queue does the same thing, so I'll fix that as well.