Fix another bug (variable name conflict)