Fixing inter-module dependency