diff --git a/src/jasper/modules/world/src/world.cpp b/src/jasper/modules/world/src/world.cpp
index a969f8e..f80111f 100644
--- a/src/jasper/modules/world/src/world.cpp
+++ b/src/jasper/modules/world/src/world.cpp
@@ -35,8 +35,8 @@ ox::Error World::setupDisplay() noexcept {
 		}
 		++objIdx;
 	}
-	auto &kctx = keelCtx(m_nctx);
 	if (m_tilesheets.empty()) {
+		auto &kctx = keelCtx(m_nctx);
 		for (auto const&tsAddr : m_worldStatic.tilesheets) {
 			OX_REQUIRE_M(ts, keel::readObj<ncore::CompactTileSheet>(kctx, tsAddr));
 			m_tilesheets.emplace_back(std::move(ts));
@@ -86,7 +86,7 @@ void World::setupTile(
     auto &t = tile(m_worldStatic, lyr, x, y);
     auto const tx = static_cast<int>(x) * 2;
     auto const ty = static_cast<int>(y) * 2;
-    auto const &obj = m_worldStatic.objTileRefSets[t.objIdxRefSet];;
+    auto const &obj = m_worldStatic.objTileRefSets[t.objIdxRefSet];
     ncore::setBgTile(m_nctx, lyr, tx + 0, ty + 0, {
         .tileIdx = static_cast<uint_t>(obj.cbbIdx + 0),
         .palBank = obj.palBank,