Damm Fucking Cross Dependencies found and solved