Fix for #110.