PR #269