diff --git a/inc/mep_shortcode.php b/inc/mep_shortcode.php
index f83937e..48bbe23 100644
--- a/inc/mep_shortcode.php
+++ b/inc/mep_shortcode.php
@@ -35,6 +35,8 @@ function mep_event_calender()
             const myEvents = [
                 <?php
                 // $loop       = mep_event_query('all',-1);
+                $event_expire_on_old = mep_get_option('mep_event_expire_on_datetimes', 'general_setting_sec', 'event_start_datetime');
+                $event_expire_on    = $event_expire_on_old == 'event_expire_datetime' ? 'end' : 'start';                   
                 $args = array(
                     'post_type'         => array('mep_events'),
                     'posts_per_page'    => -1,
@@ -51,7 +53,7 @@ function mep_event_calender()
                     $event_dates = mep_get_event_dates_arr(get_the_id());
                     $now 		= current_time('Y-m-d H:i:s');
 foreach ($event_dates as $_dates) {
-    if(strtotime($now) < strtotime($_dates['start']) ){
+    if(strtotime($now) < strtotime($_dates[$event_expire_on]) ){
     ?>
 {
                         start   : '<?php echo date_i18n('Y-m-d H:i', strtotime($_dates['start'])); ?>',
@@ -67,8 +69,8 @@ foreach ($event_dates as $_dates) {
 }
 }
 $i++;
-                
-                wp_reset_postdata(); ?>
+    wp_reset_postdata(); 
+?>
             ]
 
             jQuery('.event-calendar').equinox({
diff --git a/inc/template-prts/event_add_cart.php b/inc/template-prts/event_add_cart.php
index 801efd1..8beb759 100755
--- a/inc/template-prts/event_add_cart.php
+++ b/inc/template-prts/event_add_cart.php
@@ -56,14 +56,13 @@ if (!function_exists('mep_get_event_reg_btn')) {
 		$upcoming_date              = $recurring == 'no' ? '' : $_upcoming_date;
         $total_sold                 = mep_get_event_total_seat_left($post_id, $upcoming_date);
         $total_left                 = $total_seat - ($total_sold + $total_resv);        
-        // $total_left                  = mep_get_event_total_seat_left($post_id, $upcoming_date);
-
+        $total_left                 = $recurring == 'no' ? $total_left : 1;
         $reg_status                 = array_key_exists('mep_reg_status', $event_meta) ? esc_html($event_meta['mep_reg_status'][0]) : '';
         $seat_left                  = apply_filters('mep_event_total_seat_left_count', $total_left, $post_id);
         $current                    = current_time('Y-m-d H:i:s');
         $time                       = strtotime($event_expire_date);
         $newformat                  = date('Y-m-d H:i:s', $time);
-        $recurring                  = get_post_meta($post_id, 'mep_enable_recurring', true) ? get_post_meta($post_id, 'mep_enable_recurring', true) : 'no';
+        
 
         if ($recurring == 'yes') {
             $event_more_dates         = get_post_meta($post_id, 'mep_event_more_date', true) ? get_post_meta($post_id, 'mep_event_more_date', true) : array();
@@ -112,8 +111,8 @@ if (!function_exists('mep_get_event_reg_btn')) {
                 /**
                  * If All the seats are booked then it fire the below hooks, The event no seat texts are in the inc/template-parts/event_labels.php file
                  */
-                do_action('mep_event_no_seat_text',$post_id);
-                do_action('mep_after_no_seat_notice',$post_id);
+               do_action('mep_event_no_seat_text',$post_id);
+               do_action('mep_after_no_seat_notice',$post_id);
 
             } else {
                 /**
diff --git a/inc/template-prts/single-events.php b/inc/template-prts/single-events.php
index 7ef9ebc..028f6de 100644
--- a/inc/template-prts/single-events.php
+++ b/inc/template-prts/single-events.php
@@ -33,8 +33,10 @@ if (post_password_required()) {
         <div class="mep-events-container">
             <?php
             if (!class_exists('WC_Bundles')) {
-				if (!class_exists('WEPOF_Extra_Product_Options')) {				
-                do_action('woocommerce_before_single_product');
+				if (!class_exists('WEPOF_Extra_Product_Options')) {	
+					if (!class_exists('WC_Advanced_Country_Restrictions_Dist')) {
+               			 do_action('woocommerce_before_single_product');
+					}
 			   }
             }
             $theme_name = "/themes/$_current_template";
diff --git a/readme.txt b/readme.txt
index 26c1d89..3c7312d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: magepeopleteam, aamahin
 Tags: event, woocomerce events manager, events manager, Wordpress Events plugin, Events plugin, wp events
 Requires at least: 5.3
-Stable tag: 3.8.0
-Version: 3.8.0
+Stable tag: 3.8.1
+Version: 3.8.1
 Tested up to: 6.1
 WC requires at least: 3.0
 WC tested up to: 6.5
@@ -912,4 +912,11 @@ Bug fixed
 * Update Release:
 Escpaing issue fixed
 Bug fixed
-10 Jan 2023*
\ No newline at end of file
+10 Jan 2023*
+
+
+= 3.8.1=
+* Update Release:
+Recurring Waitlist showing issue fixed.
+Bug fixed
+19 Jan 2023*
\ No newline at end of file
diff --git a/woocommerce-event-press.php b/woocommerce-event-press.php
index 4d7eba6..2bf1089 100644
--- a/woocommerce-event-press.php
+++ b/woocommerce-event-press.php
@@ -3,7 +3,7 @@
  * Plugin Name: Event Manager and Tickets Selling Plugin for WooCommerce
  * Plugin URI: http://mage-people.com
  * Description: A Complete Event Solution for WordPress by MagePeople..
- * Version: 3.8.0
+ * Version: 3.8.1
  * Author: MagePeople Team
  * Author URI: http://www.mage-people.com/
  * Text Domain: mage-eventpress