Follow-up to #1310
Activity