Possible bug fixing for windoze