fix previous changes for non-windows