Fix, as provided by Doug Kyle, for LP#822918