Fix subscription controller