Fixed empty tuple handling