Fix #16: Handle multiple EventHandler