Fixing support for 'default' event