Fix event reporting

This fixes event reporting and saves one ZK call.