diff --git a/src/id3/v2/items/key_value_frame.rs b/src/id3/v2/items/key_value_frame.rs
index 7bcf983f..1e3b8bac 100644
--- a/src/id3/v2/items/key_value_frame.rs
+++ b/src/id3/v2/items/key_value_frame.rs
@@ -50,7 +50,10 @@ impl KeyValueFrame {
 			values.push((key.content, value.content));
 		}
 
-		Ok(Some(Self { encoding, key_value_pairs: values }))
+		Ok(Some(Self {
+			encoding,
+			key_value_pairs: values,
+		}))
 	}
 
 	/// Convert a [`KeyValueFrame`] to a byte vec
diff --git a/src/id3/v2/tag.rs b/src/id3/v2/tag.rs
index 837dafff..dc27e496 100644
--- a/src/id3/v2/tag.rs
+++ b/src/id3/v2/tag.rs
@@ -788,11 +788,8 @@ impl SplitTag for Id3v2Tag {
 						FrameValue::Popularimeter(popularimeter) => {
 							ItemValue::Binary(popularimeter.as_bytes())
 						},
-						FrameValue::KeyValueFrame(_) => {
-							return true; // Keep frame
-						},
 						FrameValue::Binary(binary) => ItemValue::Binary(std::mem::take(binary)),
-						FrameValue::UniqueFileIdentifier(_) => {
+						FrameValue::KeyValueFrame(_) | FrameValue::UniqueFileIdentifier(_) => {
 							return true; // Keep unsupported frame
 						},
 					};