fix Api to deal with there always being a Scope object in Context