Try to fix module support