Improved tuple_cat fix