Fix Extra Vars
Fix Extra Vars