Context service corrected