try to fix circular dependencies

works for me :)