Update:  properly expands into string