Follow-up to prev commit