Fix extra data case for tuple with single value