This is for the Git Issue #167