Possible fix for #180