Fixed bug causing `eventTimeout` to always be null