Fix #33 - event management is somewhat broken in FF