still fix index