Re #1112 refactoring