refactor, fixed exception by bad event_date