Bug fix for #15