Fixed [un]subscribe process