fixed subscription handling on disconnect