Add further fix for scoping issue.