Fixed inheritence references