Fix for bug #28214