variable name clash fix.