Fix double disconnect