task #1733: refactoring