diff --git a/src/backend/drm/device/mod.rs b/src/backend/drm/device/mod.rs
index 7de307b..5e315ce 100644
--- a/src/backend/drm/device/mod.rs
+++ b/src/backend/drm/device/mod.rs
@@ -410,16 +410,28 @@ impl<A: AsRawFd + 'static> DrmDevice<A> {
             });
         }
 
-        if let (Ok(1), &DrmSurfaceInternal::Atomic(ref surf)) = (
-            self.get_driver_capability(DriverCapability::AddFB2Modifiers),
-            &internal,
-        ) {
+        if let Ok(1) = 
+            self.get_driver_capability(DriverCapability::AddFB2Modifiers)
+        {
             let set = self.get_properties(plane).map_err(|source| Error::Access {
                 errmsg: "Failed to query properties",
                 dev: self.dev_path(),
                 source,
             })?;
-            if let Ok(prop) = surf.plane_prop_handle(plane, "IN_FORMATS") {
+            let (handles, _) = set.as_props_and_values();
+            // for every handle ...
+            let prop = handles.iter().find(|handle| {
+                // get information of that property
+                if let Some(info) = self.get_property(**handle).ok() {
+                    // to find out, if we got the handle of the "IN_FORMATS" property ...
+                    if info.name().to_str().map(|x| x == "IN_FORMATS").unwrap_or(false) {
+                        // so we can use that to get formats
+                        return true;
+                    }
+                }
+                false
+            }).copied();
+            if let Some(prop) = prop {
                 let prop_info = self.get_property(prop).map_err(|source| Error::Access {
                     errmsg: "Failed to query property",
                     dev: self.dev_path(),