diff --git a/src/switch_core_file.c b/src/switch_core_file.c
index 28f1172ff8..6beaa83584 100644
--- a/src/switch_core_file.c
+++ b/src/switch_core_file.c
@@ -395,7 +395,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh,
 				}
 			}
 		}
-
 		fh->samples_out += orig_len;
 		return status;
 	} else {
@@ -550,7 +549,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh)
 					if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) {
 						break;
 					}
-					fh->samples_out += blen;
 				}
 			}
 		}
diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index f941ff85c8..f3d554faeb 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -779,9 +779,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
 		
 	}
 
-	if (read_impl.samples_per_second) {
-		switch_channel_set_variable_printf(channel, "record_seconds", "%d", fh->samples_out / read_impl.samples_per_second);
-		switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (read_impl.samples_per_second / 1000));
+	if (read_impl.actual_samples_per_second) {
+		switch_channel_set_variable_printf(channel, "record_seconds", "%d", fh->samples_out / read_impl.actual_samples_per_second);
+		switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (read_impl.actual_samples_per_second / 1000));
 
 	}