Fix for TVPs where no data is specified