[#43] Save previous location if present