Fix bug in 'unset' statement