Fixed to work with new queue exchanges