Attempt to fix disconnect bug