First crack at fixing this was in #73.
First crack at fixing this was in #73.