Refactoring #1157