fix event subscription