Fixed command-line build
Fixed command-line build