fixed to work in windows