Fixes #112 (Modularity issues)