I think all things are being called on the correct queues now, but will make sure next time. So if you find this do not use in production yet!