bugfix using broker class