diff --git a/src/oxframe.c b/src/oxframe.c
index a8d747a..7b72a8f 100644
--- a/src/oxframe.c
+++ b/src/oxframe.c
@@ -116,13 +116,6 @@ void write_image_file(OggPlayRGBChannels *data, oxstate * state) {
     imlib_image_set_format("jpg");
   imlib_save_image(state->output);
   imlib_free_image_and_decache();
-  
-  imlib_context_set_image(frame);
-  imlib_free_image_and_decache();
-  if (state->image_width > 0) {
-    imlib_context_set_image(image);
-    imlib_free_image_and_decache();
-  }
 }
 
 void write_frame (OggPlay * player, int track_num,
@@ -434,6 +427,7 @@ int extract_frame_webm(oxstate *state) {
                     OggPlayRGBChannels  to;
 
                     done = 1;
+                    i = tracks;
 
                     from.y_width = img->d_w;
                     from.y_height = img->d_h;