Possible fix for the CNFException on the EventHandler
Another build