Fixed timezone issues that came with duplicate event fix