Fixed subscription bug