Fixed some issue related to Jaws_Event