Added correction by Alvaro Videla
Merge branch 'amqp_fixes'