- fix variable redefinition