diff --git a/STYLEGUIDE b/STYLEGUIDE
index c57e07c8..e955dc55 100644
--- a/STYLEGUIDE
+++ b/STYLEGUIDE
@@ -6,6 +6,9 @@
   don't change the spacing, indentation, curly braces, etc, 
   in routines you did not write.
 
+* If you want to make a change which effects many many functions,
+  please check with the maintainer first.
+
 * Respect the indentation of the author of the original function.
   If the indentation is not consistent, use 4.
 
diff --git a/libmp3lame/encoder.c b/libmp3lame/encoder.c
index 0906f713..987b72c4 100644
--- a/libmp3lame/encoder.c
+++ b/libmp3lame/encoder.c
@@ -392,7 +392,7 @@ char *mp3buf, int mp3buf_size)
   /*  write the frame to the bitstream  */
   getframebits(gfc, &bitsPerFrame, &mean_bits);
 
-  format_bitstream( gfc, bitsPerFrame, l3_enc, scalefac);
+  format_bitstream( gfp, bitsPerFrame, l3_enc, scalefac);
 
   /* copy mp3 bit buffer into array */
   mp3count = copy_buffer(mp3buf,mp3buf_size,&gfc->bs);