alter regex to support win