Fix --force mode of build client (2nd attempt..)