diff --git a/ChangeLog b/ChangeLog
index 42de2e16f7..adec768b34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-24  Wim Taymans  <wim@fluendo.com>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):
+	Fix potential division by zero error and hopefully get
+	the position query right to get correct timestamps on avi
+	audio.
+
 2004-05-24  Wim Taymans  <wim@fluendo.com>
 
 	* gst/videoscale/videoscale.c: (gst_videoscale_scale_nearest),
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 8608171427..11c95ded07 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -439,8 +439,7 @@ gst_avi_demux_handle_src_query (GstPad * pad,
     case GST_QUERY_POSITION:
       switch (*format) {
         case GST_FORMAT_TIME:
-          if (stream->strh->samplesize &&
-              stream->strh->type == GST_RIFF_FCC_auds) {
+          if (stream->strh->rate && stream->strh->type == GST_RIFF_FCC_auds) {
             *value = ((gfloat) stream->current_byte) * GST_SECOND /
                 stream->strh->rate;
           } else {