Remove variable ambiguity