Fixed stupid event handler resolver bug