Fix for #108.