Close #20, but only for contexts