bug in the last commit fixed