Fix #3 - Timeout for events