Code review comment, see #29