Fix with module names that have spaces