Bugfix per code review.

Auditors: pl