Fix issue with legacy inheritance IDs