Proper adjustment of the context