Trying to prevent infinite loops in production