fix for SPR23712