Bug fixing in Modularity