Fixed a problem, which we assumed will be handled by git and it should have been handled by git