Index fix for save