Fix for command line utility