Tries to get rid of EventHandler to solve #402 and #404

Tested with Erwan. Should work. I hope so.