Build #222:   fix: #291 on branch refactoring over 7 years ago