Bug fix for #426