Fixed usage with modules