Fix for FS#8082: