Revert "Revert "fixing git issue""

This reverts commit e22643fdf62f53ae56da5035c8880e9db9b2e50e.