[FIX] No events in future infinite loop

- Fix #22