NXP-12667 fix issues introduced by last commit ... still does not work under windows