Fixed UsageCalculator's singleton working in User.#