Added RestoreArray but doesn't seem to help much