Fixed issue with stopping bad events