Fix one more class hierarchy problem