Fix watch: always wait for the last version