Follow-up to #999.
Follow-up to #999.