Fixed function overrides generating duplicate started and finished events