hotfix to remove some errors