fix some bug in subscription