Fix bug in last commit