BUGFIX: dependencies not tracked correctly