Dependancy injection fix