Fix close() issue on MessageBus
Tagged version 0.5.21