Bug fix for #99