Fixing (again) problem with event markers