Follow-up: #2801
Follow-up: #2801