Fix for #2899, CR 1949.