The only robust way i can think of that will make persistent-location work