Bugfix - event undefined