Attempted fix for a bug on Windows