Attempt fix of regex replace