Fixed the tuple issue