diff --git a/src/floppy/fdd_86f.c b/src/floppy/fdd_86f.c
index fab6e8caa..34c9b2f57 100644
--- a/src/floppy/fdd_86f.c
+++ b/src/floppy/fdd_86f.c
@@ -10,7 +10,7 @@
  *		data in the form of FM/MFM-encoded transitions) which also
  *		forms the core of the emulator's floppy disk emulation.
  *
- * Version:	@(#)fdd_86f.c	1.0.12	2018/09/02
+ * Version:	@(#)fdd_86f.c	1.0.13	2018/09/15
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -746,7 +746,7 @@ d86f_valid_bit_rate(int drive)
 		return 1;
     }
 
-    return 1;	//FIXME: should be 0 for error?
+    return 0;
 }
 
 
@@ -2996,12 +2996,13 @@ void
 d86f_write_tracks(int drive, FILE **f, uint32_t *track_table)
 {
     d86f_t *dev = d86f[drive];
-    int sides;
+    int sides, fdd_side;
     int side, thin_track;
     int logical_track = 0;
+    uint32_t *tbl;
+    tbl = dev->track_offset;
+    fdd_side = fdd_get_head(drive);
     sides = d86f_get_sides(drive);
-    uint32_t *tbl = dev->track_offset;
-    int fdd_side = fdd_get_head(drive);
 
     if (track_table)
 	tbl = track_table;