Fixed variable redefinition in alternate code path