removed workaround for events