Fix for #108