diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/AbstractAssetModelBuilder.java b/ccm-cms/src/main/java/org/librecms/pages/models/AbstractAssetModelBuilder.java
index 9d2bbaffb..501676ec3 100644
--- a/ccm-cms/src/main/java/org/librecms/pages/models/AbstractAssetModelBuilder.java
+++ b/ccm-cms/src/main/java/org/librecms/pages/models/AbstractAssetModelBuilder.java
@@ -37,7 +37,7 @@ implements AssetModelBuilder<T, M> {
     
     @Override
     @SuppressWarnings("unchecked")
-    public M buildAssetModel(final Asset asset) {
+    public M buildAssetModel(final T asset) {
         final M model = buildModel();
         model.setDisplayName(asset.getDisplayName());
         model.setTitle(
@@ -45,7 +45,7 @@ implements AssetModelBuilder<T, M> {
         );
         model.setUuid(asset.getUuid());
         
-        addProperties((T) asset, model);
+        addProperties(asset, model);
         
         return model;
     }
diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/AssetModelBuilder.java b/ccm-cms/src/main/java/org/librecms/pages/models/AssetModelBuilder.java
index b4f0bacd2..e0d9ee76b 100644
--- a/ccm-cms/src/main/java/org/librecms/pages/models/AssetModelBuilder.java
+++ b/ccm-cms/src/main/java/org/librecms/pages/models/AssetModelBuilder.java
@@ -23,10 +23,12 @@ import org.librecms.contentsection.Asset;
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ * @param <T>
+ * @param <M>
  */
 public interface AssetModelBuilder<T extends Asset, M extends AbstractAssetModel> {
 
-    M buildAssetModel(Asset asset);
+    M buildAssetModel(T asset);
 
     Class<T> buildsAssetModelFor();