Fix the disconnect issue (I think?)