fix inheritance issues