Fix for the loader