Fixed for #108.