Fixed unset variables