Bug Fix with messages not being put into correct queues