Switch to newer click (2.0)