Temporary fix for endless module loop
Temporary fix for endless module loop