fix dependency and fix member