fixed screwed up cross dependencies