Fixed Variabale unset issue