Change to use substitute() and SUBSTITUTE=FALSE