context branch fixed