Bug fix.
This fixes a bug introduced by the changes for task #3838 (https://gna.org/task/?3838). It is also a partial fix for bug #7544 (https://gna.org/bugs/?7544).
Authored by: bugman 2006-11-23
Parent: [r2868]
Child: [r2870]
