diff --git a/terrain_viewer/rs_world.pas b/terrain_viewer/rs_world.pas
index 5284753..ab64263 100644
--- a/terrain_viewer/rs_world.pas
+++ b/terrain_viewer/rs_world.pas
@@ -228,9 +228,14 @@ begin
 end;
 
 procedure TWorld.LoadFromFiles(const hmp, tex, texmap: string);
+var
+  i: Integer;
 begin
   LoadHeightmap(hmp);
   LoadTextures(tex, texmap);
+  for i := 0 to heightmap.tile_count - 1 do begin
+      heightmap.tiles[i].texture_index := heightmap.texture_index_map[heightmap.tiles[i].texture_index];
+  end;
 end;
 
 constructor TWorld.Create;
diff --git a/terrain_viewer/terrain_viewer.pas b/terrain_viewer/terrain_viewer.pas
index b644667..59b7f81 100644
--- a/terrain_viewer/terrain_viewer.pas
+++ b/terrain_viewer/terrain_viewer.pas
@@ -200,7 +200,7 @@ begin
   view.pitch := 0;
   view.x := 0;
   view.y := 0;
-  view.autorotate := true;
+  view.autorotate := false;
   view.opts.wireframe := false;
   view.opts.points := false;
   view.opts.vcolors := true;