Fix issue where set name doesn't work if saved