Follow up for #4
Follow up for #4