Maintain correct context