For issue with module divergence, see #2
There might be a simple conflict to fix after !36 (merged) is merged