actually hooked the handler in #212
Two birds with one stone, #200, #210