regexp fix to include windows