minor index fix when None