follow up for #165
follow up for #165