Fixed event target bug