Follow-up to #1398, #1548
2 files changed