diff --git a/src/Magnum/Trade/MeshData.cpp b/src/Magnum/Trade/MeshData.cpp
index 1f1b06c7b..af709a187 100644
--- a/src/Magnum/Trade/MeshData.cpp
+++ b/src/Magnum/Trade/MeshData.cpp
@@ -884,8 +884,8 @@ Debug& operator<<(Debug& debug, const MeshAttribute value) {
     if(!packed)
         debug << "Trade::MeshAttribute" << Debug::nospace;
 
-    if(UnsignedShort(value) >= UnsignedShort(MeshAttribute::Custom))
-        return debug << (packed ? "Custom(" : "::Custom(") << Debug::nospace << (UnsignedInt(value) - UnsignedInt(MeshAttribute::Custom)) << Debug::nospace << ")";
+    if(isMeshAttributeCustom(value))
+        return debug << (packed ? "Custom(" : "::Custom(") << Debug::nospace << meshAttributeCustom(value) << Debug::nospace << ")";
 
     switch(value) {
         /* LCOV_EXCL_START */
diff --git a/src/Magnum/Trade/SceneData.cpp b/src/Magnum/Trade/SceneData.cpp
index 64a5b469f..602d3a976 100644
--- a/src/Magnum/Trade/SceneData.cpp
+++ b/src/Magnum/Trade/SceneData.cpp
@@ -112,8 +112,8 @@ Debug& operator<<(Debug& debug, const SceneField value) {
     if(!packed)
         debug << "Trade::SceneField" << Debug::nospace;
 
-    if(UnsignedInt(value) >= UnsignedInt(SceneField::Custom))
-        return debug << (packed ? "Custom(" : "::Custom(") << Debug::nospace << (UnsignedInt(value) - UnsignedInt(SceneField::Custom)) << Debug::nospace << ")";
+    if(isSceneFieldCustom(value))
+        return debug << (packed ? "Custom(" : "::Custom(") << Debug::nospace << sceneFieldCustom(value) << Debug::nospace << ")";
 
     switch(value) {
         /* LCOV_EXCL_START */