bugfix shutdown - Broker should now shut down properly