Bugfix after latest commit.