diff --git a/minigrida/descriptors/aps.py b/minigrida/descriptors/aps.py
index add63f8..6d7d95c 100644
--- a/minigrida/descriptors/aps.py
+++ b/minigrida/descriptors/aps.py
@@ -28,9 +28,10 @@ def run(gt, rasters, coords, remove, attributes, adjacency='4', filtering='direc
 
     for i, (gti, rastersi, coordsi) in enumerate(zip(gt, rasters, coords)):
         # Compute EAP
+        attributes = [attributes] * len(rastersi) if isinstance(attributes, dict) else attributes
         eap = []
-        for name, raster in rastersi.items():
-            eap += [_attribute_profiles(raster, attributes, adjacency, name, filtering)]
+        for (name, raster), attribute in zip(rastersi.items(), attributes):
+            eap += [_attribute_profiles(raster, attribute, adjacency, name, filtering)]
         eap = sap.concatenate(eap)
 
         Xn = [' '.join((a['tree']['image_name'],