Fix dependancy loop