Fix for command line setup