possible fix for #214 ?

ugly.