Improved fix for subtype/supertype display issue