Fixed a bug in subscription