Fix entity extends