Fix already declared variables