rounding out PR #688