fixed subscribing for events