Fix check on events