Hotfix: remove the dependency