Another fix for circular dependencies (my last fix actually broke stuff)