implement suggestion #199