fix #7989 - add support for extended classes (partial)