Slight improvement of snapshot saving