Fix off-by-one in regex replace and add test (#2144)

Fix off-by-one in regex replace and add test (#2144) #1639