Apply improvement proposed in #2142
2 files changed