Hopefully fixed inheritance