follow up on #165
follow up on #165