Fixed Defect GIT-25