Trying to fix dup messages, again