Fixed tuple bug