fix index layout issue