Fixed issue with BUILD_DIR