fixed issues when including from module