Fixed inheritance v2