commented out unset to avoid fatal error
updated version