hackish fix for more events