Re #1113 refactoring