Correct context logic