I do some modification to correct some issue