Updated last context issue