Adding windows fix from 1.4.1