Improved previous patch so it really solves the Windows issue.