#283: small refactoring