Change to fix regex string replace