bug fix in last commit