With my own handler (still ugly)