Fix theoretical disconnect issue