Fixed variable re-declaration