Fix for tuples