Loader hotfix