Fixes bug on event finder