Tuple fix