diff --git a/commonTypes.h b/commonTypes.h
index 74f3fc6b..0bf095fd 100644
--- a/commonTypes.h
+++ b/commonTypes.h
@@ -6,6 +6,8 @@
 
 #include "common.h"
 #include "SpriteColors.h"
+
+#include "df/coord.h"
 #include "df/enabler.h"
 #include "df/graphic.h"
 
@@ -92,8 +94,9 @@ struct Crd3D {
 
 struct OptCrd3D : public std::optional<Crd3D>
 {
+    using coord_t = decltype(df::coord::x);
     operator df::coord() const {
-        return has_value() ? df::coord{ uint16_t(value().x), uint16_t(value().y), uint16_t(value().z) } : df::coord{};
+        return has_value() ? df::coord{ static_cast<coord_t>(value().x), static_cast<coord_t>(value().y), static_cast<coord_t>(value().z) } : df::coord{};
     }
     OptCrd3D() {};
     OptCrd3D(const df::coord& c) {