diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesHelper.java
index 5fa7494552..95ecb07a68 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesHelper.java
@@ -347,10 +347,10 @@ public class PersistentAttributesHelper {
 	private static String inferGenericTypeName(CtClass ctClass, SignatureAttribute.Type genericSignature) {
 		// infer targetEntity from generic type signature
 		if ( isAssignable( ctClass, Collection.class.getName() ) ) {
-			return ( (SignatureAttribute.ClassType) genericSignature ).getTypeArguments()[0].toString();
+			return ( (SignatureAttribute.ClassType) genericSignature ).getTypeArguments()[0].getType().jvmTypeName();
 		}
 		if ( isAssignable( ctClass, Map.class.getName() ) ) {
-			return ( (SignatureAttribute.ClassType) genericSignature ).getTypeArguments()[1].toString();
+			return ( (SignatureAttribute.ClassType) genericSignature ).getTypeArguments()[1].getType().jvmTypeName();
 		}
 		return ctClass.getName();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java
index 8b280041a8..a3fd951c47 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java
@@ -8,6 +8,7 @@ package org.hibernate.test.bytecode.enhancement;
 
 import javassist.CtClass;
 
+import org.hibernate.test.bytecode.enhancement.association.InheritedAttributeAssociationTestTask;
 import org.hibernate.test.bytecode.enhancement.otherentityentrycontext.OtherEntityEntryContextTestTask;
 import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
@@ -92,6 +93,7 @@ public class EnhancerTest extends BaseUnitTestCase {
 		EnhancerTestUtils.runEnhancerTestTask( OneToOneAssociationTestTask.class );
 		EnhancerTestUtils.runEnhancerTestTask( OneToManyAssociationTestTask.class );
 		EnhancerTestUtils.runEnhancerTestTask( ManyToManyAssociationTestTask.class );
+		EnhancerTestUtils.runEnhancerTestTask( InheritedAttributeAssociationTestTask.class );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/InheritedAttributeAssociationTestTask.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/InheritedAttributeAssociationTestTask.java
new file mode 100644
index 0000000000..d76eb2386c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/InheritedAttributeAssociationTestTask.java
@@ -0,0 +1,86 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.bytecode.enhancement.association;
+
+import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+/**
+ * @author Luis Barreiro
+ */
+public class InheritedAttributeAssociationTestTask extends AbstractEnhancerTestTask {
+
+	public Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] { Author.class, Item.class, ChildItem.class };
+	}
+
+	@Override
+	public void prepare() {
+	}
+
+	@Override
+	@TestForIssue( jiraKey = "HHH-11050")
+	public void execute() {
+		// The mapping is wrong but the point is that the enhancement phase does not need to fail. See JIRA for further detail
+
+		// If enhancement of 'items' attribute fails, 'name' won't be enhanced
+		Author author = new Author();
+		author.name = "Bernardo Soares";
+		EnhancerTestUtils.checkDirtyTracking( author, "name" );
+	}
+
+	@Override
+	protected void cleanup() {
+	}
+
+	@Entity
+	public static class Author {
+
+		@Id @GeneratedValue
+		Long id;
+
+		@OneToMany(fetch = FetchType.LAZY, mappedBy="author")
+		List<ChildItem> items;
+
+		// keep this field after 'items'
+		String name;
+	}
+
+	@MappedSuperclass
+	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+	@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING)
+	public static abstract class Item {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		Author author;
+	}
+
+	@Entity
+	@DiscriminatorValue("child")
+	public static class ChildItem extends Item {
+	}
+
+}