Fix possible variable name conflig