fix the tuple issue