Hmm, site-index needs an overhaul. But I see an issue and it works for
now.