Fixed deadlock on subnet change