Fix bugs in simple_click tool