Fix messenger class