Fixes missing refactoring