Try to eliminate some error from original git