Fix event subscription