fix diff stuff