diff --git a/acatcher/convert_audio.sh b/acatcher/convert_audio.sh
index fc0dab3..b80d590 100755
--- a/acatcher/convert_audio.sh
+++ b/acatcher/convert_audio.sh
@@ -86,7 +86,7 @@ fi
 
 cd "$SOURCE_DIR"
 for DIR in *; do
-  if [ ! -d "$WAV_DIR" ]; then
+  if [ ! -d "$WAV_DIR/$DIR" ]; then
     mkdir -p "$WAV_DIR/$DIR"
   fi
   if [ "$ENCODE_FLAC" = "YES" -a ! -d "$FLAC_DIR/$DIR" ]; then
@@ -106,7 +106,7 @@ for DIR in *; do
       echo "......filename conflict detected, adding some randomness"
       FUDGE="$RANDOM"
       BASENAME="$BASENAME-$FUDGE"
-      RAWNAME="$BASENAME-$FUDGE.raw"
+      RAWNAME="$BASENAME.raw"
     fi
     echo "......renaming to $RAWNAME"
     mv "$INFILE" "$RAWNAME"