Fix for #110