fix bug by last commit