FIXing end events fasiling to end