fix bug, with last commit