Update from issue report.