Half-assed patch to improve issue identified in #55.

Trying to not do too much work here in advance of v1.4