[TR,PS] {issue} I10 - Fixed class hierachy