Re #1131 refactoring