fix(core) closer should get the same base context

License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>