Custom event firing fixes
Small demo