Issue GIT-6 fix