Support module as well. Fixes #182