Fixed SET expiry issue