Fix for wrong modularity