CAAERS-6912 - fixing invalid replacement issue.