Committed a fix that seems to address the issue--please test and I will close this bug.