Fix RIPD-166.

Most minimal fix to 166.

See discussion here.