diff --git a/MapLoading.cpp b/MapLoading.cpp
index ce2ad862..aa70c809 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -644,7 +644,7 @@ void readBlockToSegment(DFHack::Core& DF, WorldSegment& segment,
 
 namespace
 {
-    void parse_tree(WorldSegment& segment, auto pp, auto info, auto parts, auto depth, bool downward, auto raw)
+    void parse_tree(WorldSegment& segment, df::plant *pp, df::plant_tree_info *info, auto parts, int32_t depth, bool downward, df::plant_raw *raw)
     {
         for (int zz = 0; zz < depth; zz++)
         {
@@ -663,7 +663,7 @@ namespace
                         df::coord pos = pp->pos;
                         pos.x = pos.x - (info->dim_x / 2) + xx;
                         pos.y = pos.y - (info->dim_y / 2) + yy;
-                        pos.z = pos.z + downward ? zz : (-1 - zz);
+                        pos.z = pos.z + (downward ? (-1 - zz) : zz);
                         if (!segment.CoordinateInsideSegment(pos.x, pos.y, pos.z))
                             continue;
                         Tile* t = segment.getTile(pos.x, pos.y, pos.z);
@@ -674,7 +674,7 @@ namespace
                         t->tree.type = pp->type;
                         t->tree.index = pp->material;
                         // only update tree_tile if part is a plant_tree_tile
-                        if constexpr (std::assignable_from<decltype(t->tree_tile), decltype(part)>)
+                        if constexpr (std::assignable_from<decltype(t->tree_tile)&, decltype(part)>)
                         {
                             t->tree_tile = part;
                             if (raw)
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7ecad818..88025708 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,7 @@ Template for new versions:
 
 ## Fixes
 - `stonesense`: fixed a crash when rendering materials with an out-of-range color index
+- `stonesense`: fixed tree materials not being applied correctly
 
 ## Misc Improvements