Fix variable context