diff --git a/create_retroarch_chd_playlist.sh b/create_retroarch_chd_playlist.sh
index 9db67db..7f5a0c6 100755
--- a/create_retroarch_chd_playlist.sh
+++ b/create_retroarch_chd_playlist.sh
@@ -283,7 +283,7 @@ zxspectrum)
 
 esac
 
-if test f "${PLAYLISTS_FOLDER}"/"${PLAYLIST_NAME}".lpl; then
+if test -f "${PLAYLISTS_FOLDER}"/"${PLAYLIST_NAME}".lpl; then
     rm "${PLAYLISTS_FOLDER}"/"${PLAYLIST_NAME}".lpl
 fi
 touch "${PLAYLISTS_FOLDER}"/"${PLAYLIST_NAME}".lpl
@@ -297,7 +297,7 @@ echo "  \"right_thumbnail_mode\": 0,";
 echo "  \"left_thumbnail_mode\": 0,";
 echo "  \"sort_mode\": 0,";
 echo "  \"items\": [" >>"${PLAYLISTS_FOLDER}"/"${PLAYLIST_NAME}".lpl
-for CHDFILE in "${ROM_FOLDER}"/"${SYSTEM}"/*.chd; do
+for CHDFILE in "${ROM_FOLDER}"/*.chd; do
     GAMENAME="$(basename "$CHDFILE" .chd)"
     echo "    {";
     echo "      \"path\": \"${BASE_PATH}/${CHDFILE}\",";