For Git issue #207