Fix for command line