diff --git a/src/floppy/fdd_86f.c b/src/floppy/fdd_86f.c
index 8934bc85c..ebea29abe 100644
--- a/src/floppy/fdd_86f.c
+++ b/src/floppy/fdd_86f.c
@@ -1577,7 +1577,7 @@ d86f_read_sector_data(int drive, int side)
 			} else {
 				if (dev->data_find.bytes_obtained < d86f_get_data_len(drive)) {
 					if (dev->state != STATE_16_VERIFY_DATA) {
-						read_status = fdc_data(d86f_fdc, data, dev->data_find.bytes_obtained == ((d86f_get_data_len(drive)) - 1));
+						read_status = fdc_data(d86f_fdc, data, dev->data_find.bytes_obtained == (d86f_get_data_len(drive) - 1));
 						if (read_status == -1)
 							dev->dma_over++;
 					}
@@ -2137,16 +2137,16 @@ d86f_turbo_read(int drive, int side)
 	recv_data = d86f_get_data(drive, 0);
 	d86f_compare_byte(drive, recv_data, dat);
     } else {
-	if (dev->turbo_pos < (128UL << dev->last_sector.id.n)) {
+	if (dev->data_find.bytes_obtained < d86f_get_data_len(drive)) {
 		if (dev->state != STATE_16_VERIFY_DATA) {
-			read_status = fdc_data(d86f_fdc, dat, dev->turbo_pos == ((128UL << dev->last_sector.id.n) - 1));
+			read_status = fdc_data(d86f_fdc, data, dev->data_find.bytes_obtained == (d86f_get_data_len(drive) - 1));
 			if (read_status == -1)
 				dev->dma_over++;
 		}
 	}
     }
 
-    if (dev->turbo_pos >= (128 << dev->last_sector.id.n)) {
+    if (dev->turbo_pos >= d86f_get_data_len(drive)) {
 	dev->data_find.sync_marks = dev->data_find.bits_obtained = dev->data_find.bytes_obtained = 0;
 	if ((flags & SECTOR_CRC_ERROR) && (dev->state != STATE_02_READ_DATA)) {
 #ifdef ENABLE_D86F_LOG