Fixing messages