Fix event unescaping