diff --git a/src/aeso_ast_to_icode.erl b/src/aeso_ast_to_icode.erl
index ffcb48a..e9dd732 100644
--- a/src/aeso_ast_to_icode.erl
+++ b/src/aeso_ast_to_icode.erl
@@ -28,7 +28,8 @@ code([{contract, _Attribs, Con, Code}|Rest], Icode) ->
     NewIcode = contract_to_icode(Code, aeso_icode:set_namespace(Con, Icode)),
     code(Rest, NewIcode);
 code([{namespace, _Ann, Name, Code}|Rest], Icode) ->
-    NewIcode = contract_to_icode(Code, aeso_icode:enter_namespace(Name, Icode)),
+                                            %% TODO: nested namespaces
+    NewIcode = contract_to_icode(Code, aeso_icode:set_namespace(Name, Icode)),
     code(Rest, NewIcode);
 code([], Icode) ->
     add_default_init_function(add_builtins(Icode)).