Fixing bug with qualified messages