AMQP-363

I made changes as described in Jira issue AMQP-363