Bug fix due to last merge-commit.