Adaption of MBassador 1.1.3