Fixing the Inheritance issue.