Repaired insert to work with expression values again