Follow up for #165
Follow up for #165