Dependency tracking fixed.

Change-Id: Ia507a390c329c643976ab8547400aa5e88ab4704