Fix concurrency issue

As reported here: https://github.com/SamSaffron/message_bus/issues/18