Bugfixing invalid dependencies