FIx for dubble messages