index fix for <8