fix dependency and bug