Bugfix for last commit.