BC-1719 better index