refactoring related to [#2359495]