Fixed cyclic modules dependency.