Fixed dependancy loading