closes FS#352