fixed the tuple issue