Avoid global fixes when using "--range"