Solving issue with Modularity