FIX: Occasional crash on saving