Fix for #3254.