Fixed issue with passing lookup by value