fixing OnHandler support usability