Context service fix