diff --git a/ifd_builder_encode_test.go b/ifd_builder_encode_test.go
index a1728ed..b7803e7 100644
--- a/ifd_builder_encode_test.go
+++ b/ifd_builder_encode_test.go
@@ -309,5 +309,3 @@ func Test_IfdByteEncoder_encodeTagToBytes_bytes_allocated(t *testing.T) {
 // TODO(dustin): !! Test specific unknown-type tags.
 // TODO(dustin): !! Test what happens with unhandled unknown-type tags (though it should never get to this point in the normal workflow).
 // TODO(dustin): !! Test child IFDs (may not be possible until after writing tests for higher-level IB encode).
-
-
diff --git a/type_decode.go b/type_decode.go
index 2b8bfd3..9305146 100644
--- a/type_decode.go
+++ b/type_decode.go
@@ -612,7 +612,7 @@ func UndefinedValue(indexedIfdName string, tagId uint16, valueContext ValueConte
 
             tt := NewTagType(TypeAsciiNoNul, byteOrder)
 
-            valueString, err := tt.ReadAsciiValue(valueContext)
+            valueString, err := tt.ReadAsciiNoNulValue(valueContext)
             log.PanicIf(err)
 
             return TagUnknownType_GeneralString(valueString), nil
@@ -621,7 +621,7 @@ func UndefinedValue(indexedIfdName string, tagId uint16, valueContext ValueConte
 
             tt := NewTagType(TypeAsciiNoNul, byteOrder)
 
-            valueString, err := tt.ReadAsciiValue(valueContext)
+            valueString, err := tt.ReadAsciiNoNulValue(valueContext)
             log.PanicIf(err)
 
             return TagUnknownType_GeneralString(valueString), nil
@@ -722,7 +722,7 @@ func UndefinedValue(indexedIfdName string, tagId uint16, valueContext ValueConte
 
             tt := NewTagType(TypeAsciiNoNul, byteOrder)
 
-            valueString, err := tt.ReadAsciiValue(valueContext)
+            valueString, err := tt.ReadAsciiNoNulValue(valueContext)
             log.PanicIf(err)
 
             return TagUnknownType_GeneralString(valueString), nil
@@ -731,7 +731,7 @@ func UndefinedValue(indexedIfdName string, tagId uint16, valueContext ValueConte
 
             tt := NewTagType(TypeAsciiNoNul, byteOrder)
 
-            valueString, err := tt.ReadAsciiValue(valueContext)
+            valueString, err := tt.ReadAsciiNoNulValue(valueContext)
             log.PanicIf(err)
 
             return TagUnknownType_GeneralString(valueString), nil
@@ -742,7 +742,7 @@ func UndefinedValue(indexedIfdName string, tagId uint16, valueContext ValueConte
 
             tt := NewTagType(TypeAsciiNoNul, byteOrder)
 
-            valueString, err := tt.ReadAsciiValue(valueContext)
+            valueString, err := tt.ReadAsciiNoNulValue(valueContext)
             log.PanicIf(err)
 
             return TagUnknownType_GeneralString(valueString), nil