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