Fix bugs of last update