Make parse file work more better.