diff --git a/installer/installer/AMXInstaller.exe b/installer/installer/AMXInstaller.exe
index ba4fe21d..93a464b1 100755
Binary files a/installer/installer/AMXInstaller.exe and b/installer/installer/AMXInstaller.exe differ
diff --git a/installer/installer/UnitFunctions.pas b/installer/installer/UnitFunctions.pas
index 263f56d7..870b8064 100755
--- a/installer/installer/UnitFunctions.pas
+++ b/installer/installer/UnitFunctions.pas
@@ -66,7 +66,7 @@ begin
   try
     eRegistry.RootKey := HKEY_CURRENT_USER;
     if eRegistry.OpenKey('Software\Valve\Steam', False) then
-      Result := ExtractFilePath(StringReplace(eRegistry.ReadString('SteamExe'), '/', '\', [rfReplaceAll])) + 'SteamApps\'
+      Result := IncludeTrailingBackslash(StringReplace(eRegistry.ReadString('SteamPath'), '/', '\', [rfReplaceAll])) + 'SteamApps\'
     else
       Result := '';
   except
@@ -82,9 +82,9 @@ begin
   Result := TStringList.Create;
   ePath := GetSteamAppsDir;
   if DirectoryExists(ePath) then begin
-    if FindFirst(ePath + '*.*', faDirectory, eSearch) = 0 then begin
+    if FindFirst(ePath + '*.*', faAnyFile, eSearch) = 0 then begin
       repeat
-        if (Pos('@', eSearch.Name) <> 0) then
+        if (eSearch.Attr and faDirectory = faDirectory) and (eSearch.Name <> '.') and (eSearch.Name <> '..') and (LowerCase(eSearch.Name) <> 'sourcemods') then
           Result.Add(eSearch.Name)
       until FindNext(eSearch) <> 0;
     end;