Fix to remove context