Zero index fix