* Fixed bug #467, possibly at the cost of poorer performance.