fixed cyclic dependency besides other things.