1010404: Earlier fix introduced string replacement issue