Fixing issue with new Scope Identity code.