fix for core events