modularity bugfix