better check and include more failing lines
reflect changes
Merge branch 'fix/windows'