Fix for Windows systems part 3