fixed issues under Windows