BF: temporary index fix