Fixing a deadlock when running with multiple nodes