Fix issue with tup not being set