updated to use 1.6.x @EventHandler