Fixed MessageBinder to avoid BC Break