Applied patch #145 to the V3 branch