Fix for #426