fixed dependancy problem