Fix messenger