Bugfix for undefined event attributes