Fixed resubscribing issue