fix bugs 4.23