Bug fix with set value
Bug fix with set value