correct fix for #2 - previous commit broke handlers