#108: small refactoring