fix bugs, for details see UPDATELOG.md