Fixed a bug that happens when subscription is None