quick fix for FS#8729