Is this change correct - especially for lookupjoin?