bugfix and renamed type_node to