Fixed broker issue