better fix for windows