Fix Refactoring to use Loaders fixes #2570