Landed a fix for bug #2037.