fixes for value_decorator