Change safe_substitute() to substitute() to remove silent errors