For Git Issue #188