last commit has a bug, fix it