fix bugs for 4b