Bugfix for the last commit.