handle_click spec + fix