Fix for #2430.