updated for SPR 24678 hot fix.