Fixed: issue when edit devicevalues