Fix for #2425, CR 1526