Fixed 'Bug 17601 - Code issue for static event handlers'