Feature/rabbitmq fix