- Fixed Duplicate Events bug