Bugfix recursive dependency