FIXED: Missing unset