Fix --force mode of build client