incremental; fixing after refactoring referenced modules