Temporary fix for endless module loop