Do not depend too much

489