Bug fix to the last commit.