Fixed Invalid Vars