Fixed Critical Index Issue Bug On Saving