Kb/improve wincred compatibility v2