Fix for TLV encoding.