Fix SWDFCommandStore