Fix compile problem with the Context