For Git issue #271