Bugfix: Prevent rare case duplicate messages