diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
index 0f9cdf6fc6..5cc1ea133d 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
@@ -113,6 +113,7 @@ public class MetaAttributeGenerationVisitor extends SimpleTypeVisitor6<Annotatio
 		TypeElement returnedElement = (TypeElement) context.getTypeUtils().asElement( declaredType );
 		// WARNING: .toString() is necessary here since Name equals does not compare to String
 		String fqNameOfReturnType = returnedElement.getQualifiedName().toString();
+		// TODO - need to fix METAGEN-62, need to check whether the specified type is a subtype of a collection type
 		String collection = Constants.COLLECTIONS.get( fqNameOfReturnType );
 		String targetEntity = getTargetEntity( element.getAnnotationMirrors() );
 		if ( collection != null ) {
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java
index 469d03f893..f86523dbbe 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java
@@ -18,9 +18,7 @@ package org.hibernate.jpamodelgen.test.elementcollection;
 
 import java.util.Map;
 import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
 import javax.persistence.MapKeyClass;
-import javax.persistence.OneToMany;
 
 
 /**
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/OneToManySortedTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/OneToManySortedTest.java
new file mode 100644
index 0000000000..ce94154e40
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/OneToManySortedTest.java
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.hibernate.jpamodelgen.test.onetomanysorted;
+
+import org.testng.annotations.Test;
+
+import org.hibernate.jpamodelgen.test.util.CompilationTest;
+
+import static org.hibernate.jpamodelgen.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+import static org.hibernate.jpamodelgen.test.util.TestUtil.assertPresenceOfFieldInMetamodelFor;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class OneToManySortedTest extends CompilationTest {
+
+	@Test
+	public void testGenerics() {
+		assertMetamodelClassGeneratedFor( Printer.class );
+		assertMetamodelClassGeneratedFor( PrintJob.class );
+		assertPresenceOfFieldInMetamodelFor( Printer.class, "printQueue", "There one to many attribute is missing" );
+	}
+
+	@Override
+	protected String getPackageNameOfCurrentTest() {
+		return OneToManySortedTest.class.getPackage().getName();
+	}
+}
\ No newline at end of file
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/PrintJob.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/PrintJob.java
new file mode 100644
index 0000000000..cff6c9203e
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/PrintJob.java
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.jpamodelgen.test.onetomanysorted;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Entity
+public class PrintJob {
+	@Id
+	@GeneratedValue
+	private long id;
+
+	@Lob
+	private byte[] data;
+}
+
+
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/Printer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/Printer.java
new file mode 100644
index 0000000000..d6af8f299b
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/Printer.java
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.jpamodelgen.test.onetomanysorted;
+
+import java.util.SortedSet;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+import org.hibernate.annotations.Sort;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Entity
+public class Printer {
+	@Id
+	@GeneratedValue
+	private long id;
+
+	@OneToMany
+	@Sort
+	private SortedSet<PrintJob> printQueue;
+}
+
+