Bugfix from renaming.