Fixing invalid event loading (detected after some testing)