Fix bug
Change input format