diff --git a/src/cairoWriter/index.ts b/src/cairoWriter/index.ts
index 155ff887d..b467a152d 100644
--- a/src/cairoWriter/index.ts
+++ b/src/cairoWriter/index.ts
@@ -89,7 +89,6 @@ import {
   StructDefinitionWriter,
   StructuredDocumentationWriter,
   TupleExpressionWriter,
-  UncheckedBlockWriter,
   VariableDeclarationStatementWriter,
   VariableDeclarationWriter,
 } from './writers';
@@ -150,7 +149,7 @@ export const CairoASTMapping = (ast: AST, throwOnUnimplemented: boolean) =>
     [TryStatement, new NotImplementedWriter(ast, throwOnUnimplemented)],
     [TupleExpression, new TupleExpressionWriter(ast, throwOnUnimplemented)],
     [UnaryOperation, new NotImplementedWriter(ast, throwOnUnimplemented)],
-    [UncheckedBlock, new UncheckedBlockWriter(ast, throwOnUnimplemented)],
+    [UncheckedBlock, new BlockWriter(ast, throwOnUnimplemented)],
     [UserDefinedTypeName, new NotImplementedWriter(ast, throwOnUnimplemented)],
     [UsingForDirective, new NotImplementedWriter(ast, throwOnUnimplemented)],
     [VariableDeclaration, new VariableDeclarationWriter(ast, throwOnUnimplemented)],
diff --git a/src/cairoWriter/writers/blockWriter.ts b/src/cairoWriter/writers/blockWriter.ts
index aa3e6fce6..b73be784e 100644
--- a/src/cairoWriter/writers/blockWriter.ts
+++ b/src/cairoWriter/writers/blockWriter.ts
@@ -1,9 +1,9 @@
-import { ASTWriter, Block, SrcDesc } from 'solc-typed-ast';
+import { ASTWriter, Block, UncheckedBlock, SrcDesc } from 'solc-typed-ast';
 import { CairoASTNodeWriter } from '../base';
 import { getDocumentation, INDENT } from '../utils';
 
 export class BlockWriter extends CairoASTNodeWriter {
-  writeInner(node: Block, writer: ASTWriter): SrcDesc {
+  writeInner(node: Block | UncheckedBlock, writer: ASTWriter): SrcDesc {
     const documentation = getDocumentation(node.documentation, writer);
     return [
       [
diff --git a/src/cairoWriter/writers/index.ts b/src/cairoWriter/writers/index.ts
index 1119c47c0..7dd522648 100644
--- a/src/cairoWriter/writers/index.ts
+++ b/src/cairoWriter/writers/index.ts
@@ -23,6 +23,5 @@ export * from './sourceUnitWriter';
 export * from './structDefinitionWriter';
 export * from './structuredDocumentationWriter';
 export * from './tupleExpressionWriter';
-export * from './uncheckedBlockWriter';
 export * from './variableDeclarationStatementWriter';
 export * from './variableDeclarationWriter';
diff --git a/src/cairoWriter/writers/uncheckedBlockWriter.ts b/src/cairoWriter/writers/uncheckedBlockWriter.ts
deleted file mode 100644
index ab1cb2acf..000000000
--- a/src/cairoWriter/writers/uncheckedBlockWriter.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ASTWriter, SrcDesc, UncheckedBlock } from 'solc-typed-ast';
-import { CairoASTNodeWriter } from '../base';
-import { getDocumentation, INDENT } from '../utils';
-
-export class UncheckedBlockWriter extends CairoASTNodeWriter {
-  writeInner(node: UncheckedBlock, writer: ASTWriter): SrcDesc {
-    const documentation = getDocumentation(node.documentation, writer);
-    return [
-      [
-        documentation,
-        node.vStatements
-          .map((value) => writer.write(value))
-          .map((v) =>
-            v
-              .split('\n')
-              .map((line) => INDENT + line)
-              .join('\n'),
-          )
-          .join('\n'),
-      ].join('\n'),
-    ];
-  }
-}