Trying to fix a modularity issue