Fixing the inheritance