debug clean
bug fix in "all events"