Fixed clickAndWait