Issue #11875: Alter the previous fix to work better with subclasses