Bugfix for changes in last commit.