diff --git a/pykd/typedvar.cpp b/pykd/typedvar.cpp
index 7e268db..d75a61f 100644
--- a/pykd/typedvar.cpp
+++ b/pykd/typedvar.cpp
@@ -222,7 +222,7 @@ std::string UdtTypedVar::print()
 {
     std::stringstream  sstr;
 
-    sstr << "struct/class: " << m_typeInfo->getName() << " " << m_varData->asString();
+    sstr << "struct/class: " << m_typeInfo->getName() << " " << m_varData->asString() << std::endl;
     
     for ( ULONG i = 0; i < m_typeInfo->getFieldCount(); ++i )
     {
diff --git a/pykd/typeinfo.cpp b/pykd/typeinfo.cpp
index c1cc4b1..dc07b9d 100644
--- a/pykd/typeinfo.cpp
+++ b/pykd/typeinfo.cpp
@@ -463,10 +463,10 @@ TypeInfoPtr UdtTypeInfo::getField( const std::string &fieldName )
 
 TypeInfoPtr UdtTypeInfo::getFieldByIndex( ULONG index  )
 {
-    if ( index >= m_dia->getChildCount() )
+    if ( index >= m_dia->getChildCount(SymTagData) )
         throw TypeException( m_dia->getName(), ": field not found" );
 
-    pyDia::SymbolPtr field = m_dia->getChildByIndex(index);
+    pyDia::SymbolPtr field = m_dia->getChildByIndex(index, SymTagData);
 
     if ( !field )
         throw TypeException( m_dia->getName(), ": field not found" );