Save panning information and be more robust