fixed issues with modules