Followup to #78.
Followup to #78.