closes FS#336