Bug fix for #33