[IMP] better index, on behalf of ferdinand, bug 571203