Fix for bug #10323 (https://gna.org/bugs/?10323).
This bug was reported by Douglas Kojetin <douglas dot kojetin at gmail dot com>.
The fix was to simply use the same fix which went into the equivalent model-free code years and years ago!
Authored by: bugman 2007-11-13
Parent: [r3524]
Child: [r3526]
