Fix the implementation of expiring events