Related to #155 but distinct.
Related to #155 but distinct.