GitHub #68: Harder than I thought!  But fixed, I believe.