Code review for 75183fd02892b073bf675602cc5a29604e4de569 (#130)