Small refactor to debug the events not being found