Fixed dependancy loop