fix bugs from preview commit