Fix

ordering issue with event list