Fixing bogus messaging