fix bugs on ValueSystem