Yet another fix after renaming