Fixed unsetting expiry issue
updated version