Update eventhandler for 0.85 comptatibility