Also fixed unset().