device/save fix