Bugfix for out-of-order messages in queue-watcher