Fix bug related message-consumption