Fixing a messaging issue