This is a follow-up to #153
This is a follow-up to #153