Changed set_value behaviour