Fixed command-line build