fixed old struct