fix index totally