Another Windows compatibility improvement