hotfix for loading bug