Event reporting after return fixed