Properly deal with subscription status, and fix variable name bug