@@ -712,37 +712,24 @@ protected static String getRelated( ProgramElementDoc doc ) throws IOException
 		TemplateWriter templateWriter = new TemplateWriter();
 		ArrayList<HashMap<String, String>> vars = new ArrayList<HashMap<String,String>>();
 
-		// it is no longer clear to me what purpose this classMembers mapping serves
-		// It's left in source for now in case it proves important. However, building the
-		// entire reference only turned up cases where it overwrites method @see tags
-		// with field @see tags, which is not something we want.
-		// Eliminating this fixes github issue 137
-		/*
-		HashMap<String, ProgramElementDoc> classMembers = new HashMap<String, ProgramElementDoc>();
+		// keep track of class members so that links to methods in e.g. PGraphics
+		// that are copied into PApplet are correctly linked.
+		HashMap<String, ProgramElementDoc> classMethods = new HashMap<String, ProgramElementDoc>();
+		HashMap<String, ProgramElementDoc> classFields = new HashMap<String, ProgramElementDoc>();
 		if( doc.isMethod() || doc.isField() )
-		{
+		{	// fill our maps
 			ClassDoc containingClass = doc.containingClass();
-			// consider only doing this if we aren't in the core
-			// doing this in the core protects against errant references to PGraphics
-			// if( !containingClass.name().equalsIgnoreCase("PApplet") )
-			{
-				for( MethodDoc m : containingClass.methods() )
-				{
-					if( needsWriting( m ) )
-					{
-						classMembers.put( m.name(), m );
-					}
+			for( MethodDoc m : containingClass.methods() ) {
+				if( needsWriting( m ) ) {
+					classMethods.put( m.name(), m );
 				}
-				for( FieldDoc f : containingClass.fields() )
-				{
-					if( needsWriting( f ) )
-					{
-						classMembers.put( f.name(), f );
-					}
+			}
+			for( FieldDoc f : containingClass.fields() ) {
+				if( needsWriting( f ) ) {
+					classFields.put( f.name(), f );
 				}
 			}
 		}
-		//*/
 
 		// add link to each @see item
 		for( SeeTag tag : getAllSeeTags( doc ) )
@@ -752,28 +739,19 @@ protected static String getRelated( ProgramElementDoc doc ) throws IOException
 			if( tag.referencedMember() != null )
 			{
 				ref = tag.referencedMember();
-/*
-				if( classMembers.containsKey( ref.name() ) )
-				{
-					ProgramElementDoc prior = classMembers.get( ref.name() );
-					String refType = (ref.isMethod() ? " Method()" : " Field");
-					String priorType = (prior.isMethod() ? " Method()" : " Field");
-					if( !priorType.equals( refType ) )
-					{
-						System.out.println( "\n++++++++++++++++++++++++++++++++++++++++++" );
-						System.out.println( "Would collapse " + ref.name() + refType );
-						System.out.println( "into " + prior.name() + priorType );
-						System.out.println( "++++++++++++++++++++++++++++++++++++++++++\n" );
-					}
-					// previously, we replaced references this way
-					// doesn't seem to be helpful
+				if( ref.isMethod() && classMethods.containsKey( ref.name() ) ) {
+					// link to the member as it is in this class, instead of
+					// as it is in another class
+					ProgramElementDoc prior = classMethods.get( ref.name() );
+					ref = prior;
+				}
+				else if ( ref.isField() && classFields.containsKey( ref.name() ) ) {
+					ProgramElementDoc prior = classFields.get( ref.name() );
 					ref = prior;
 				}
-*/
 			}
 			if( needsWriting( ref ) )
-			{
-				// add links to things that are actually written
+			{ // add links to things that are actually written
 				map.put("name", getName( ref ));
 				map.put("anchor", getAnchor( ref ));
 				vars.add(map);
@@ -825,9 +803,7 @@ protected static String getRelated( ProgramElementDoc doc ) throws IOException
 				{
 					e.printStackTrace();
 				}
-
 			}
-
 		}
 
 		return templateWriter.writeLoop("related.partial.html", vars);