Your suggested patch seems correct, so I've applied it in CVS. Tons of thanks!!
(I've detected potentially the same problem with aliases, so I've coded the solution there too).
Please, test and close Bug 1266 if everything is working fine now.
TIA and ciao,