Fixed save to work in location env