Command line \0 fix