Fixed subscription issue