Fix to work with both Linux and Windows