Added option -Xs to completion code.