fix ambiguous reference to 's' var.