Fixed manage subscription behavior