Bugfix in dependency order