implement suggestion #199 cont'd