Fixed variable re-definition