Fix Inheritance Change from Port