redo messagebus to be stabler