Fixed issue with build-dir and --walk not working properly