Fixes #2931 - make Handler static to slove lint