Rework review 132, issue #191