Review of #141