fixed FS#183