quick fix for conflicting command line options.  See XD-581