PCT-506 Pull #89 review