Bug fix over last commit.