Fix bugs
Version 4.64