Inspired by discussion in #150
Inspired by discussion in #150