Fixed Defect GIT-26