fixed: some (un)subscribe issues